Skip to content

Update VXL and ITK#479

Open
mattdawkins wants to merge 22 commits intomasterfrom
dev/update-vxl-itk
Open

Update VXL and ITK#479
mattdawkins wants to merge 22 commits intomasterfrom
dev/update-vxl-itk

Conversation

@mattdawkins
Copy link
Member

VXL update was required for the ITK version

Conflicts:
	CMake/fletch-tarballs.cmake
Conflicts:
	CMake/fletch-tarballs.cmake
@kwcvrobot
Copy link
Collaborator

Can one of the admins verify this patch?

@mattdawkins
Copy link
Member Author

You can... talk?

Conflicts:
	CMake/External_VXL.cmake
Conflicts:
	CMake/External_VXL.cmake
Conflicts:
	Patches/VXL/FindFFMPEG.cmake
@dstoup
Copy link
Collaborator

dstoup commented Jan 2, 2019

If this patch fixes the upstream VXL's ffmpeg issue then please push it there instead of making a fletch patch. I can approve and merge VXL branches so I would prefer not patching locally.

@dstoup
Copy link
Collaborator

dstoup commented Apr 11, 2019

jenkins test this please

@@ -0,0 +1,606 @@
// This is core/vidl/vidl_ffmpeg_ostream_v56.hxx
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a new file or patched from VXL source? If it's patched, it would be ideal to add in 2 commits so we can see the actual diff

@dstoup
Copy link
Collaborator

dstoup commented Apr 11, 2019

Having looked at the diff in the VXL patch, is there a good reason we don't push this into that repo? Also, why don't we go closer to master? Is something else broken?

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@mattdawkins
Copy link
Member Author

Something else was broken on latest VXL in the time period of this branch though that's fairly old now so maybe it was fixed, haven't had a chance to look at this in more detail and this branch is still broken on Windows due to a bug in VXL's build sys

@dstoup
Copy link
Collaborator

dstoup commented Jul 16, 2019

Jenkins test this please

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

mattdawkins and others added 6 commits July 22, 2019 16:02
This reverts commit 2d5bd16.
This reverts commit 814e90a.
This reverts commit 14007ca.
This reverts commit 13fc389.
Conflicts:
	CMake/fletch-tarballs.cmake
@dstoup
Copy link
Collaborator

dstoup commented Jul 23, 2019

I have been testing recently and currently master fails on VS with link errors.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants